1. 29 3月, 2021 1 次提交
  2. 01 3月, 2021 1 次提交
  3. 27 2月, 2021 1 次提交
  4. 23 2月, 2021 1 次提交
  5. 22 1月, 2021 1 次提交
    • K
      merge dev to alert_plugin_design (#4530) · 73b0eaa9
      Kirs 提交于
      * 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: Nwuchunfu <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: NEights-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: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nwuchunfu <319355703@qq.com>
      Co-authored-by: Ndailidong <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: Nlenboo <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: Nqiaozhanwei <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 e367f90b.
      
      * 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: Nqiaozhanwei <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: Nqiaozhanwei <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: Nqiaozhanwei <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: Nqiaozhanwei <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: Nqiaozhanwei <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: Nqiaozhanwei <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: Nqiaozhanwei <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: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      Co-authored-by: Nzhuangchong <zhuangchong8@163.com>
      Co-authored-by: NJinyLeeChina <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: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      Co-authored-by: Nzhuangchong <zhuangchong8@163.com>
      Co-authored-by: NJinyLeeChina <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: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      Co-authored-by: Nzhuangchong <zhuangchong8@163.com>
      Co-authored-by: NJinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
      Co-authored-by: Ndailidong <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: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nxingchun-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: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nxingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
      
      * [Fix-#3713][common]Fix that catfile method Stream not closed
      Co-authored-by: NBoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nxingchun-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: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nqiaozhanwei <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: Nbaoliang <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: NKirs <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: NKirs <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: Nbaoliang <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: Nbaoliang <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: Nbaoliang <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: Nbaoliang <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: Nbaoliang <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: Nbreak60 <790061044@qq.com>
      Co-authored-by: Nwuchunfu <319355703@qq.com>
      Co-authored-by: Nlgcareer <18610854716@163.com>
      Co-authored-by: Nxingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
      Co-authored-by: Nlenboo <baoliang@analysys.com.cn>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      Co-authored-by: NYelli <amarantine@my.com>
      Co-authored-by: NEights-Li <yelli.hl@gmail.com>
      Co-authored-by: NJinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>
      Co-authored-by: NXiaotaoYi <v-xiayi@hotmail.com>
      Co-authored-by: NYichao Yang <1048262223@qq.com>
      Co-authored-by: Nzhuangchong <zhuangchong8@163.com>
      Co-authored-by: NBoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
      Co-authored-by: Nmuzhongjiang <mu_zhongjiang@163.com>
      Co-authored-by: NJave-Chen <baicai.chen@gmail.com>
      Co-authored-by: Nzhuangchong <zhuangchong6@163.com>
      Co-authored-by: Nzhuangchong <37063904+zhuangchong@users.noreply.github.com>
      Co-authored-by: NKirs <acm_master@163.com>
      Co-authored-by: Nlgcareer <lgcareer@apache.org>
      Co-authored-by: Nwulingqi <wulingqi@baijiahulian.com>
      
      * Revert "[Draft][Merge][133-dev]133 merge dev (#4031)" (#4057)
      
      This reverts commit ad2d9f99.
      
      * [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: Nzhanglong <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: Nzhuangchong <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: Nzhanglong <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: Nchengp <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: Nbaoliang <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: Nzhanglong <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: Nxingchun-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: Ndailidong <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: Nhailin0 <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: NKirs <acm_master@163.com>
      Co-authored-by: N0002939 <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: Nhailin0 <hailin0@yeah.net>
      
      * [Fix][common] only two yarns can be selected(#4314) (#4344)
      
      * modify_Status (#4352)
      Co-authored-by: Nzt-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: N李长福 <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: Nyinyong <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: NTinaPang <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: Nzt-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: Nbobqiu <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: Nyaoshui <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: Nlinyanbin <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: Nzt-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: N蒙强 <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: Nlei.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: N花花 <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: Nbaoliang <baoliang@analysys.com.cn>
      Co-authored-by: NEights-LI <yelli.eights@gmail.com>
      Co-authored-by: Nbao liang <29528966+lenboo@users.noreply.github.com>
      Co-authored-by: Nbreak60 <790061044@qq.com>
      Co-authored-by: Nwuchunfu <319355703@qq.com>
      Co-authored-by: Nlgcareer <18610854716@163.com>
      Co-authored-by: Nxingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      Co-authored-by: NYelli <amarantine@my.com>
      Co-authored-by: NEights-Li <yelli.hl@gmail.com>
      Co-authored-by: NJinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>
      Co-authored-by: NXiaotaoYi <v-xiayi@hotmail.com>
      Co-authored-by: NYichao Yang <1048262223@qq.com>
      Co-authored-by: Nzhuangchong <zhuangchong8@163.com>
      Co-authored-by: NBoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
      Co-authored-by: Nmuzhongjiang <mu_zhongjiang@163.com>
      Co-authored-by: NJave-Chen <baicai.chen@gmail.com>
      Co-authored-by: Nzhuangchong <zhuangchong6@163.com>
      Co-authored-by: Nzhuangchong <37063904+zhuangchong@users.noreply.github.com>
      Co-authored-by: Nlgcareer <lgcareer@apache.org>
      Co-authored-by: Nwulingqi <wulingqi@baijiahulian.com>
      Co-authored-by: Nhailin0 <hailin0@yeah.net>
      Co-authored-by: Nzhanglong <zhanglong@ysstech.com>
      Co-authored-by: Nt1mon <178317391@qq.com>
      Co-authored-by: Nyangquan <iyeeku@qq.com>
      Co-authored-by: syso1's avatarliliang1991 <liliang_68@126.com>
      Co-authored-by: Nliang.li.c <liang.li.c@17zuoye.com>
      Co-authored-by: Nfelix.wang <59079269+felix-thinkingdata@users.noreply.github.com>
      Co-authored-by: Nchengshiwen <chengshiwen0103@gmail.com>
      Co-authored-by: Nyinancx <mockibird@live.cn>
      Co-authored-by: NYarlung <turingdojo@163.com>
      Co-authored-by: Nkarlsun <karlsun@tencent.com>
      Co-authored-by: N曹聚阳 <yinancx@live.com>
      Co-authored-by: Nwangxj3 <857234426@qq.com>
      Co-authored-by: chengp...'s avatarchengp <5058557@qq.com>
      Co-authored-by: Nchengp <chengp@chengp.net>
      Co-authored-by: NSaksham Gupta <saksham1319@gmail.com>
      Co-authored-by: NTq <36755957+Tianqi-Dotes@users.noreply.github.com>
      Co-authored-by: NJatham <59549328+Jatham922@users.noreply.github.com>
      Co-authored-by: Nhailin0 <hailin0@foxmail.com>
      Co-authored-by: Nzh0122 <zh0122@gmail.com>
      Co-authored-by: Ngeosmart <geosmart@hotmail.com>
      Co-authored-by: 李丛阳's avatar李丛阳 <liby-1987@163.com>
      Co-authored-by: N0002939 <licongyang@mininglamp.com>
      Co-authored-by: kamisamak's avatarkamisamak <1057372918@qq.com>
      Co-authored-by: Nzt-1997 <41983395+zt-1997@users.noreply.github.com>
      Co-authored-by: Nzt-1997 <“18841012545@163.com”>
      Co-authored-by: NxiaojingXU <68894048+xxjingcd@users.noreply.github.com>
      Co-authored-by: Nguohaozhang <zhishengqianjun@gmail.com>
      Co-authored-by: Ncooper <1322849632@qq.com>
      Co-authored-by: N李长福 <changfu.li@dmall.com>
      Co-authored-by: Nyy0812 <32183971+yy0812@users.noreply.github.com>
      Co-authored-by: Nyinyong <yinyong@netposa.com>
      Co-authored-by: Nptyp <30622951+ptyp@users.noreply.github.com>
      Co-authored-by: NTinaPang <pangtianyang@analysys.com.cn>
      Co-authored-by: NDean Wong <wangding85@gmail.com>
      Co-authored-by: NK.O <okoahin@gmail.com>
      Co-authored-by: Nqiubo <38316980+qiubo369@users.noreply.github.com>
      Co-authored-by: Nbobqiu <xiaoqiu369@gmail.com>
      Co-authored-by: NHxssssss <huangqt1992@163.com>
      Co-authored-by: Nyaoshui <huangqitao@accesscorporate.com.cn>
      Co-authored-by: NZhenxu Ke <kezhenxu94@apache.org>
      Co-authored-by: NSegun Ogundipe <davephenoms@gmail.com>
      Co-authored-by: Nxiagw <fxiaxiaoyu@gmail.com>
      Co-authored-by: Nlinyanbin666 <35388422+linyanbin666@users.noreply.github.com>
      Co-authored-by: Nlinyanbin <linyanbin@lizhi.fm>
      Co-authored-by: Nqmengss <qmengss@users.noreply.github.com>
      Co-authored-by: N蒙强 <mengqiang@zhongan.com>
      Co-authored-by: N青年 <1043706593@qq.com>
      Co-authored-by: Nlei.zou <lei.zou@rootcloud.com>
      Co-authored-by: N小二黑 <784445949@qq.com>
      Co-authored-by: N花花 <huahua@thinkingdata.cn>
      Co-authored-by: Nliuxuedongcn <46193861+liuxuedongcn@users.noreply.github.com>
      73b0eaa9
  6. 07 1月, 2021 1 次提交
  7. 30 6月, 2020 2 次提交
    • B
      Revert "branch dev merge from dev-1.3.0 (#3087)" (#3094) · 5bac559d
      bao liang 提交于
      This reverts commit ab6e4310.
      Co-authored-by: Ndailidong <dailidong66@gmail.com>
      5bac559d
    • D
      branch dev merge from dev-1.3.0 (#3087) · ab6e4310
      dailidong 提交于
      * add DolphinScheduler slack channel
      
      * Update README.md
      Co-Authored-By: NJiajie 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: Nbaoliang <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: Nqiaozhanwei <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: Nqiaozhanwei <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: Nbaoliang <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: Nlidongdai <escheduler@outlook.com>
      Co-authored-by: Ndailidong <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: Nqiaozhanwei <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: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      
      * add UT (#2717)
      
      * add LoggerServerTest UT
      
      * add LoggerServerTest UT
      
      * add LoggerServerTest UT
      add RemoveTaskLogRequestCommandTest UT
      add RemoveTaskLogResponseCommandTest
      Co-authored-by: Nqiaozhanwei <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: weixin_41213428's avatarchenxingchun <438044805@qq.com>
      Co-authored-by: Ndailidong <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: Nbaoliang <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: Nqiaozhanwei <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: weixin_41213428's avatarchenxingchun <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: Nbaoliang <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: Nbaoliang <baoliang@analysys.com.cn>
      
      * Hourly dependency configuration, 'currentHour' and 'last24Hours' (#2696)
      
      * [feature] Add hourly dependency scenarios
      
      * [Feature] #2680
      
      add DependentUtilsTest UT
      Co-authored-by: Nchangqun.xu <changqun.xu@17zuoye.com>
      Co-authored-by: Nxuchangqun <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: Nsunchaohe <sunzhaohe@linklogis.com>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>
      Co-authored-by: Nlgcareer <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: Nqiaozhanwei <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: Nbaoliang <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: Nqiaozhanwei <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: Nbaoliang <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: Nqiaozhanwei <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: Nqiaozhanwei <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: Nbaoliang <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: Nbaoliang <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: Nbaoliang <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: Neights <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: Nbaoliang <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: NRubik-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: Nbaoliang <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: Nzhangchunyang1024 <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: Nzhangchunyang1024 <zhangchunyang0123@gamil.com>
      
      * [feature] readme.md adds instructions for changing environment variables (#3031)
      Co-authored-by: Nzhangchunyang1024 <zhangchunyang0123@gamil.com>
      
      * merge from dev
      
      * Change favicon.ico icon introduction method and package compilation to increase version number (#3030)
      Co-authored-by: NJiajie Zhong <zhongjiajie955@hotmail.com>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>
      Co-authored-by: weixin_41213428's avatarchenxingchun <438044805@qq.com>
      Co-authored-by: Nbreak60 <790061044@qq.com>
      Co-authored-by: Nlgcareer <18610854716@163.com>
      Co-authored-by: Nbao liang <29528966+lenboo@users.noreply.github.com>
      Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
      Co-authored-by: NSimon <3656562@qq.com>
      Co-authored-by: Nxingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
      Co-authored-by: N张世鸣 <zhangshiming@cvte.com>
      Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>
      Co-authored-by: Nliwenhe1993 <liwenhe@apache.org>
      Co-authored-by: Nxiaochun.liu <xiaochun.liu@centurygame.com>
      Co-authored-by: Nlidongdai <escheduler@outlook.com>
      Co-authored-by: Ndailidong <dolphinschedule@gmail.com>
      Co-authored-by: NTboy <guo.jiwei@immomo.com>
      Co-authored-by: Nxuchangqun <58328021+xuchangqun@users.noreply.github.com>
      Co-authored-by: Nchangqun.xu <changqun.xu@17zuoye.com>
      Co-authored-by: Nxuchangqun <changqun.x@gmail.com>
      Co-authored-by: _和's avatarzixi0825 <649790970@qq.com>
      Co-authored-by: Nsunchaohe <sunzhaohe@linklogis.com>
      Co-authored-by: Nzhangchunyang <zhangchunyang0123@gmail.com>
      Co-authored-by: Ntlhhup <137273278@qq.com>
      Co-authored-by: Nyelli.hl@foxmail.com <amarantine@my.com>
      Co-authored-by: Neights <yelli.hl@foxmail.com>
      Co-authored-by: Nyaoyao <42244568+1445103710@users.noreply.github.com>
      Co-authored-by: N小清 <62982788+597365581@users.noreply.github.com>
      Co-authored-by: Ngabry.wu <gabrywu@apache.org>
      Co-authored-by: Nt1mon <178317391@qq.com>
      Co-authored-by: NRubik-W <39549317+Rubik-W@users.noreply.github.com>
      Co-authored-by: NRubik-W <whm_777@163.com>
      Co-authored-by: Nzhangchunyang1024 <zhangchunyang0123@gamil.com>
      ab6e4310
  8. 29 6月, 2020 2 次提交
  9. 05 6月, 2020 1 次提交
  10. 08 4月, 2020 1 次提交
  11. 25 2月, 2020 1 次提交
  12. 24 1月, 2020 2 次提交
  13. 07 1月, 2020 2 次提交
  14. 29 12月, 2019 1 次提交
  15. 18 12月, 2019 1 次提交
    • T
      merge db (#2) · 09540843
      Tboy 提交于
      * Add FileUtilsTest.java , the unit test for FileUtils (#1493)
      
      * #839 enhancement : add Spark Task Component can switch Spark Version (#1494)
      
      * add Spark Version in Spark Component
      
      add Spark Version in Spark Component
      
      * add license for SparkVersion.class
      
      add license
      
      * 1 add spark task UT
      2 add spark version param check
      
      * add assert check for sparkTaskTest
      
      * fix AbstractTask's handle method exception (#1490)
      
      * fix AbstractTask's handle method exception
      
      * update ut
      
      * add ZkServer for UT (#1499)
      
      * add ZkServer for UT
      
      * Add FileUtilsTest.java , the unit test for FileUtils (#1493) (#1)
      
      * updates for reference ZkServer
      
      * DAG automatic layout (#1497)
      
      * Password verification and v-for add key
      
      * DAG automatic layout
      
      * Add common utils CollectionUtils.java DateUtils.java unit test (#1496)
      
      * dateutil test
      
      * pom.xml
      
      * Update README_zh_CN.md
      
      * Update README.md
      
      * Add ExcelUtilsTest.java , the unit test for ExcelUtils (#1500)
      
      * fix issue:1477 some tasks would be running all the time when db delayed(#1477) (#1501)
      
      * fix issue:1477 some tasks would be running all the time when db delayed
      
      * fix issue:1477 some tasks would be running all the time when db delayed
      
      * fix issue:1477 some tasks would be running all the time when db delayed
      
      * change npm run build:combined to npm burn build:release (#1504)
      09540843
  16. 17 12月, 2019 1 次提交
  17. 12 12月, 2019 3 次提交
  18. 05 12月, 2019 1 次提交
  19. 03 12月, 2019 2 次提交
    • B
      merge from dev-db (#1386) · 1baa1f42
      bao liang 提交于
      * Worker group add IP format verification (#1131)
      
      * Dependency workflow add dependency correction value
      
      * Download workflow instance map width adjustment and change "desc" field to "description"
      
      * The third-party library that builds the dependency is recommended to be placed in 'devDependencies'
      
      * Tree chart and Gantt chart style modification
      
      * The workflow instance can be deleted only when its status is success, failure, stop and pause.
      
      * change desc to description
      
      * Maximum width of tooltip is set to 500px, note the copyright number of login page
      
      * Delete copyright number
      
      * No tenant in the list of selected tenants the default is default, and the status not shown in the repair page
      
      * repair
      
      * Repair security center module prompt
      
      * Remove blank character during verification
      
      * Remove blank character during verification
      
      * Non admin users cannot create users, tenants, alarm groups, queues and worker groups
      
      * Remove CI windows detection
      
      * The value of loadaverage should be two decimal places
      
      * Add license
      
      * delete docs
      
      * update package.json
      
      * delete LICENSE
      
      * Display icon when there is no data in process definition
      
      * Worker group add IP format verification
      
      * Increase the judgment of whether it is admin (#1136)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * add postgre performance monitor (#1137)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * Modify MySQL page of monitoring center (#1138)
      
      * Dependency workflow add dependency correction value
      
      * Download workflow instance map width adjustment and change "desc" field to "description"
      
      * The third-party library that builds the dependency is recommended to be placed in 'devDependencies'
      
      * Tree chart and Gantt chart style modification
      
      * The workflow instance can be deleted only when its status is success, failure, stop and pause.
      
      * change desc to description
      
      * Maximum width of tooltip is set to 500px, note the copyright number of login page
      
      * Delete copyright number
      
      * No tenant in the list of selected tenants the default is default, and the status not shown in the repair page
      
      * repair
      
      * Repair security center module prompt
      
      * Remove blank character during verification
      
      * Remove blank character during verification
      
      * Non admin users cannot create users, tenants, alarm groups, queues and worker groups
      
      * Remove CI windows detection
      
      * The value of loadaverage should be two decimal places
      
      * Add license
      
      * delete docs
      
      * update package.json
      
      * delete LICENSE
      
      * Display icon when there is no data in process definition
      
      * Worker group add IP format verification
      
      * Modify MySQL page of monitoring center
      
      * fix bug: tasks queue length error
      
      * fix bug: tasks queue length error (#1139)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * DB page rename and background color modification (#1140)
      
      * Dependency workflow add dependency correction value
      
      * Download workflow instance map width adjustment and change "desc" field to "description"
      
      * The third-party library that builds the dependency is recommended to be placed in 'devDependencies'
      
      * Tree chart and Gantt chart style modification
      
      * The workflow instance can be deleted only when its status is success, failure, stop and pause.
      
      * change desc to description
      
      * Maximum width of tooltip is set to 500px, note the copyright number of login page
      
      * Delete copyright number
      
      * No tenant in the list of selected tenants the default is default, and the status not shown in the repair page
      
      * repair
      
      * Repair security center module prompt
      
      * Remove blank character during verification
      
      * Remove blank character during verification
      
      * Non admin users cannot create users, tenants, alarm groups, queues and worker groups
      
      * Remove CI windows detection
      
      * The value of loadaverage should be two decimal places
      
      * Add license
      
      * delete docs
      
      * update package.json
      
      * delete LICENSE
      
      * Display icon when there is no data in process definition
      
      * Worker group add IP format verification
      
      * Modify MySQL page of monitoring center
      
      * DB page rename and background color modification
      
      * IO build replace with source code (#1142)
      
      * Dependency workflow add dependency correction value
      
      * Download workflow instance map width adjustment and change "desc" field to "description"
      
      * The third-party library that builds the dependency is recommended to be placed in 'devDependencies'
      
      * Tree chart and Gantt chart style modification
      
      * The workflow instance can be deleted only when its status is success, failure, stop and pause.
      
      * change desc to description
      
      * Maximum width of tooltip is set to 500px, note the copyright number of login page
      
      * Delete copyright number
      
      * No tenant in the list of selected tenants the default is default, and the status not shown in the repair page
      
      * repair
      
      * Repair security center module prompt
      
      * Remove blank character during verification
      
      * Remove blank character during verification
      
      * Non admin users cannot create users, tenants, alarm groups, queues and worker groups
      
      * Remove CI windows detection
      
      * The value of loadaverage should be two decimal places
      
      * Add license
      
      * delete docs
      
      * update package.json
      
      * delete LICENSE
      
      * Display icon when there is no data in process definition
      
      * Worker group add IP format verification
      
      * Modify MySQL page of monitoring center
      
      * DB page rename and background color modification
      
      * IO build replace with source code
      
      * the task is abnormal and task is running bug fix (#1143)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * Replace ans charts with source code (#1144)
      
      * Dependency workflow add dependency correction value
      
      * Download workflow instance map width adjustment and change "desc" field to "description"
      
      * The third-party library that builds the dependency is recommended to be placed in 'devDependencies'
      
      * Tree chart and Gantt chart style modification
      
      * The workflow instance can be deleted only when its status is success, failure, stop and pause.
      
      * change desc to description
      
      * Maximum width of tooltip is set to 500px, note the copyright number of login page
      
      * Delete copyright number
      
      * No tenant in the list of selected tenants the default is default, and the status not shown in the repair page
      
      * repair
      
      * Repair security center module prompt
      
      * Remove blank character during verification
      
      * Remove blank character during verification
      
      * Non admin users cannot create users, tenants, alarm groups, queues and worker groups
      
      * Remove CI windows detection
      
      * The value of loadaverage should be two decimal places
      
      * Add license
      
      * delete docs
      
      * update package.json
      
      * delete LICENSE
      
      * Display icon when there is no data in process definition
      
      * Worker group add IP format verification
      
      * Modify MySQL page of monitoring center
      
      * DB page rename and background color modification
      
      * IO build replace with source code
      
      * Replace ans charts with source code
      
      * delete component-compiler-utils (#1148)
      
      * Dependency workflow add dependency correction value
      
      * Download workflow instance map width adjustment and change "desc" field to "description"
      
      * The third-party library that builds the dependency is recommended to be placed in 'devDependencies'
      
      * Tree chart and Gantt chart style modification
      
      * The workflow instance can be deleted only when its status is success, failure, stop and pause.
      
      * change desc to description
      
      * Maximum width of tooltip is set to 500px, note the copyright number of login page
      
      * Delete copyright number
      
      * No tenant in the list of selected tenants the default is default, and the status not shown in the repair page
      
      * repair
      
      * Repair security center module prompt
      
      * Remove blank character during verification
      
      * Remove blank character during verification
      
      * Non admin users cannot create users, tenants, alarm groups, queues and worker groups
      
      * Remove CI windows detection
      
      * The value of loadaverage should be two decimal places
      
      * Add license
      
      * delete docs
      
      * update package.json
      
      * delete LICENSE
      
      * Display icon when there is no data in process definition
      
      * Worker group add IP format verification
      
      * Modify MySQL page of monitoring center
      
      * DB page rename and background color modification
      
      * IO build replace with source code
      
      * Replace ans charts with source code
      
      * delete component-compiler-utils
      
      * delete progress-webpack-plugin (#1151)
      
      * Dependency workflow add dependency correction value
      
      * Download workflow instance map width adjustment and change "desc" field to "description"
      
      * The third-party library that builds the dependency is recommended to be placed in 'devDependencies'
      
      * Tree chart and Gantt chart style modification
      
      * The workflow instance can be deleted only when its status is success, failure, stop and pause.
      
      * change desc to description
      
      * Maximum width of tooltip is set to 500px, note the copyright number of login page
      
      * Delete copyright number
      
      * No tenant in the list of selected tenants the default is default, and the status not shown in the repair page
      
      * repair
      
      * Repair security center module prompt
      
      * Remove blank character during verification
      
      * Remove blank character during verification
      
      * Non admin users cannot create users, tenants, alarm groups, queues and worker groups
      
      * Remove CI windows detection
      
      * The value of loadaverage should be two decimal places
      
      * Add license
      
      * delete docs
      
      * update package.json
      
      * delete LICENSE
      
      * Display icon when there is no data in process definition
      
      * Worker group add IP format verification
      
      * Modify MySQL page of monitoring center
      
      * DB page rename and background color modification
      
      * IO build replace with source code
      
      * Replace ans charts with source code
      
      * delete component-compiler-utils
      
      * delete progress-webpack-plugin
      
      * update shutdownhook methods (#1149)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * owners and administrators can delete schedule (#1155)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * fix worker log bug (#1154)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * Release administrator delete function and select tenant not updated (#1156)
      
      * Dependency workflow add dependency correction value
      
      * Download workflow instance map width adjustment and change "desc" field to "description"
      
      * The third-party library that builds the dependency is recommended to be placed in 'devDependencies'
      
      * Tree chart and Gantt chart style modification
      
      * The workflow instance can be deleted only when its status is success, failure, stop and pause.
      
      * change desc to description
      
      * Maximum width of tooltip is set to 500px, note the copyright number of login page
      
      * Delete copyright number
      
      * No tenant in the list of selected tenants the default is default, and the status not shown in the repair page
      
      * repair
      
      * Repair security center module prompt
      
      * Remove blank character during verification
      
      * Remove blank character during verification
      
      * Non admin users cannot create users, tenants, alarm groups, queues and worker groups
      
      * Remove CI windows detection
      
      * The value of loadaverage should be two decimal places
      
      * Add license
      
      * delete docs
      
      * update package.json
      
      * delete LICENSE
      
      * Display icon when there is no data in process definition
      
      * Worker group add IP format verification
      
      * Modify MySQL page of monitoring center
      
      * DB page rename and background color modification
      
      * IO build replace with source code
      
      * Replace ans charts with source code
      
      * delete component-compiler-utils
      
      * delete progress-webpack-plugin
      
      * Release administrator delete function and select tenant not updated
      
      *  when delete access token add whether login user has perm to delete (#1159)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test (#1161)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * dockerfile optimization (#1165)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove datasource.properties
      
      * remove datasource.properties (#1168)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * remove application-alert.properties (#1167)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * fix api server debug mode bug (#1157)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * task log print worker log bug fix (#1169)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * The default timing is hourly (#1171)
      
      * Dependency workflow add dependency correction value
      
      * Download workflow instance map width adjustment and change "desc" field to "description"
      
      * The third-party library that builds the dependency is recommended to be placed in 'devDependencies'
      
      * Tree chart and Gantt chart style modification
      
      * The workflow instance can be deleted only when its status is success, failure, stop and pause.
      
      * change desc to description
      
      * Maximum width of tooltip is set to 500px, note the copyright number of login page
      
      * Delete copyright number
      
      * No tenant in the list of selected tenants the default is default, and the status not shown in the repair page
      
      * repair
      
      * Repair security center module prompt
      
      * Remove blank character during verification
      
      * Remove blank character during verification
      
      * Non admin users cannot create users, tenants, alarm groups, queues and worker groups
      
      * Remove CI windows detection
      
      * The value of loadaverage should be two decimal places
      
      * Add license
      
      * delete docs
      
      * update package.json
      
      * delete LICENSE
      
      * Display icon when there is no data in process definition
      
      * Worker group add IP format verification
      
      * Modify MySQL page of monitoring center
      
      * DB page rename and background color modification
      
      * IO build replace with source code
      
      * Replace ans charts with source code
      
      * delete component-compiler-utils
      
      * delete progress-webpack-plugin
      
      * Release administrator delete function and select tenant not updated
      
      * The default timing is hourly
      
      * remove .escheduler_env.sh (#1172)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * Resolve style conflict, recipient cannot tab and value verification (#1173)
      
      * Dependency workflow add dependency correction value
      
      * Download workflow instance map width adjustment and change "desc" field to "description"
      
      * The third-party library that builds the dependency is recommended to be placed in 'devDependencies'
      
      * Tree chart and Gantt chart style modification
      
      * The workflow instance can be deleted only when its status is success, failure, stop and pause.
      
      * change desc to description
      
      * Maximum width of tooltip is set to 500px, note the copyright number of login page
      
      * Delete copyright number
      
      * No tenant in the list of selected tenants the default is default, and the status not shown in the repair page
      
      * repair
      
      * Repair security center module prompt
      
      * Remove blank character during verification
      
      * Remove blank character during verification
      
      * Non admin users cannot create users, tenants, alarm groups, queues and worker groups
      
      * Remove CI windows detection
      
      * The value of loadaverage should be two decimal places
      
      * Add license
      
      * delete docs
      
      * update package.json
      
      * delete LICENSE
      
      * Display icon when there is no data in process definition
      
      * Worker group add IP format verification
      
      * Modify MySQL page of monitoring center
      
      * DB page rename and background color modification
      
      * IO build replace with source code
      
      * Replace ans charts with source code
      
      * delete component-compiler-utils
      
      * delete progress-webpack-plugin
      
      * Release administrator delete function and select tenant not updated
      
      * The default timing is hourly
      
      * Resolve style conflict, recipient cannot tab and value verification
      
      * change dockerfile email address (#1174)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * Refresh task instance page regularly (#1175)
      
      * Dependency workflow add dependency correction value
      
      * Download workflow instance map width adjustment and change "desc" field to "description"
      
      * The third-party library that builds the dependency is recommended to be placed in 'devDependencies'
      
      * Tree chart and Gantt chart style modification
      
      * The workflow instance can be deleted only when its status is success, failure, stop and pause.
      
      * change desc to description
      
      * Maximum width of tooltip is set to 500px, note the copyright number of login page
      
      * Delete copyright number
      
      * No tenant in the list of selected tenants the default is default, and the status not shown in the repair page
      
      * repair
      
      * Repair security center module prompt
      
      * Remove blank character during verification
      
      * Remove blank character during verification
      
      * Non admin users cannot create users, tenants, alarm groups, queues and worker groups
      
      * Remove CI windows detection
      
      * The value of loadaverage should be two decimal places
      
      * Add license
      
      * delete docs
      
      * update package.json
      
      * delete LICENSE
      
      * Display icon when there is no data in process definition
      
      * Worker group add IP format verification
      
      * Modify MySQL page of monitoring center
      
      * DB page rename and background color modification
      
      * IO build replace with source code
      
      * Replace ans charts with source code
      
      * delete component-compiler-utils
      
      * delete progress-webpack-plugin
      
      * Release administrator delete function and select tenant not updated
      
      * The default timing is hourly
      
      * Resolve style conflict, recipient cannot tab and value verification
      
      * Refresh task instance page regularly
      
      * duplicate zk client close (#1176)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * change package.xml
      
      * log view service grpc
      
      * log view service grpc
      
      * log view service grpc
      
      * log view service grpc
      
      * reset pgsql (#1178)
      
      + 1
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * log view service grpc
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom
      
      * remove package in alert,api,server
      
      * remove package in alert,api,server
      
      * add binary-front
      
      * add binary-front
      
      * change finalname
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * change finalname
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * change scm
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * change scm (#1196)
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * package.json update
      
      * package.json update
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add name
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * update version
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * change chinese sql to english.
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english.
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add ui
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * remove unused code.
      
      * add install node-sass
      
      * remove unused code.
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db (#1225)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom (#1227)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add maven-source-plugin
      
      * master startup error bug fix (#1229)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * master startup error bug fix
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * ci and maven pom.xml modify (#1234)
      
      * change verison to 1.2.0-release-SNAPSHOT (#1235)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] rollback the release of 1.2.0-release
      
      * add name in pom and remove compile (#1236)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom (#1237)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * delete class App, let spring manage connectionFactory (#1233)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * update pom
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add release-docs (#1241)
      
      license and notice statistics
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * merge from dev-db (#1248)
      
      * reset pgsql (#1178)
      
      + 1
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * master startup error bug fix (#1229)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * master startup error bug fix
      
      * delete class App, let spring manage connectionFactory (#1233)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * update pom.xml
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] prepare release 1.2.2-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * refactor masterServer and workerServer (#1244)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * ConnectionFactory add paging intercepter (#1250)
      
      * update license (#1249)
      
      * remove spotbugs-annotations.jar LGPL protocol (#1251)
      
      * ConnectionFactory add paging intercepter
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * fix #1245, make scanCommand transactional (#1246)
      
      * fix the spring transaction not worker bug  (#1252)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * fix the spring transaction not work bug
      
      * remove author
      
      * delete @Bean annotation
      
      * rename application.properties to application-dao.properties
      
      * add licenses in assemble (#1253)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * delete class MybatisPlusConfig (#1254)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * fix the spring transaction not work bug
      
      * remove author
      
      * delete @Bean annotation
      
      * rename application.properties to application-dao.properties
      
      * delete this class
      
      * change version to 1.2.0-RC1-SNAPSHOT (#1255)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * [maven-release-plugin] prepare release 1.2.0-RC1
      
      * [maven-release-plugin] prepare for next development iteration
      
      * make combined server works in new dev-db branch (#1257)
      
      * catch exception transaction method does not take effect to modify (#1258)
      
      * ConnectionFactory add paging intercepter
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * test
      
      * catch exception transaction method does not take effect to modify
      
      * .evn rollback
      
      * DataSourceService rollback
      
      * LogViewServiceGrpc rollback
      
      * move batchDelete Process Define/Instance Outside for transactional (#1260)
      
      * dockerfile add application-api.properties and change application.properties to application-dao.properties (#1259)
      
      * ConnectionFactory add paging intercepter
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * test
      
      * catch exception transaction method does not take effect to modify
      
      * .evn rollback
      
      * DataSourceService rollback
      
      * LogViewServiceGrpc rollback
      
      * dockerfile add application-api.properties and change application.properties to application-dao.properties
      
      * change assembly id (#1261)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * add DISCLAIMER (#1262)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * server startup error modify (#1263)
      
      * ConnectionFactory add paging intercepter
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * test
      
      * catch exception transaction method does not take effect to modify
      
      * .evn rollback
      
      * DataSourceService rollback
      
      * LogViewServiceGrpc rollback
      
      * dockerfile add application-api.properties and change application.properties to application-dao.properties
      
      * server startup error modify
      
      * add license in xml and properties (#1265)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Checkbox change background color and env to Chinese (#1264)
      
      * data type convert error ,email send error bug fix (#1266)
      
      * ConnectionFactory add paging intercepter
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * test
      
      * catch exception transaction method does not take effect to modify
      
      * .evn rollback
      
      * DataSourceService rollback
      
      * LogViewServiceGrpc rollback
      
      * dockerfile add application-api.properties and change application.properties to application-dao.properties
      
      * server startup error modify
      
      * data type convert error ,email send error bug fix
      
      * Remove space before and after login user name (#1267)
      
      * Checkbox change background color and env to Chinese
      
      * Remove space before and after login user name
      
      * add license in dockerfile (#1269)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * merge dev-db to 1.2.0-release (#1270)
      
      * reset pgsql (#1178)
      
      + 1
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * master startup error bug fix (#1229)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * master startup error bug fix
      
      * delete class App, let spring manage connectionFactory (#1233)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer (#1244)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * ConnectionFactory add paging intercepter
      
      * ConnectionFactory add paging intercepter (#1250)
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * remove spotbugs-annotations.jar LGPL protocol (#1251)
      
      * ConnectionFactory add paging intercepter
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * fix #1245, make scanCommand transactional (#1246)
      
      * fix the spring transaction not worker bug  (#1252)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * fix the spring transaction not work bug
      
      * remove author
      
      * delete @Bean annotation
      
      * rename application.properties to application-dao.properties
      
      * delete class MybatisPlusConfig (#1254)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgra…
      
      * disable Import on Combined Server to solve API Server not work issue (#1268)
      
      * add license in script and sql (#1271)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * merge dev-db to 1.2.0-release (#1272)
      
      * reset pgsql (#1178)
      
      + 1
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * master startup error bug fix (#1229)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * master startup error bug fix
      
      * delete class App, let spring manage connectionFactory (#1233)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer (#1244)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * ConnectionFactory add paging intercepter
      
      * ConnectionFactory add paging intercepter (#1250)
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * remove spotbugs-annotations.jar LGPL protocol (#1251)
      
      * ConnectionFactory add paging intercepter
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * fix #1245, make scanCommand transactional (#1246)
      
      * fix the spring transaction not worker bug  (#1252)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * fix the spring transaction not work bug
      
      * remove author
      
      * delete @Bean annotation
      
      * rename application.properties to application-dao.properties
      
      * delete class MybatisPlusConfig (#1254)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgra…
      
      * add license in ci (#1273)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Modify crontab style (#1274)
      
      * Checkbox change background color and env to Chinese
      
      * Remove space before and after login user name
      
      * Modify crontab style
      
      * Add required limit to SQL (#1275)
      
      * Checkbox change background color and env to Chinese
      
      * Remove space before and after login user name
      
      * Modify crontab style
      
      * Add required limit to SQL
      
      * merge dev-db to 1.2.0-release (#1276)
      
      * reset pgsql (#1178)
      
      + 1
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * master startup error bug fix (#1229)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * master startup error bug fix
      
      * delete class App, let spring manage connectionFactory (#1233)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer (#1244)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * ConnectionFactory add paging intercepter
      
      * ConnectionFactory add paging intercepter (#1250)
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * remove spotbugs-annotations.jar LGPL protocol (#1251)
      
      * ConnectionFactory add paging intercepter
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * fix #1245, make scanCommand transactional (#1246)
      
      * fix the spring transaction not worker bug  (#1252)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * fix the spring transaction not work bug
      
      * remove author
      
      * delete @Bean annotation
      
      * rename application.properties to application-dao.properties
      
      * delete class MybatisPlusConfig (#1254)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgra…
      
      * change version to 1.2.0-SNAPSHOT (#1277)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * set defalut db type postgresql (#1282)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge incomplete (#1283)
      
      * Add comments in method params and change org.quartz.jobStore.driverDelegateClass in docer file (#1284)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * REGEX_USER_NAME modify,support number and underline,task yarn status judge bug fix (#1287)
      
      * reset pgsql (#1178)
      
      + 1
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * master startup error bug fix (#1229)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * master startup error bug fix
      
      * delete class App, let spring manage connectionFactory (#1233)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer (#1244)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * ConnectionFactory add paging intercepter
      
      * ConnectionFactory add paging intercepter (#1250)
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * remove spotbugs-annotations.jar LGPL protocol (#1251)
      
      * ConnectionFactory add paging intercepter
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * fix #1245, make scanCommand transactional (#1246)
      
      * fix the spring transaction not worker bug  (#1252)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * fix the spring transaction not work bug
      
      * remove author
      
      * delete @Bean annotation
      
      * rename application.properties to application-dao.properties
      
      * delete class MybatisPlusConfig (#1254)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker …
      
      * add sql files for postgre/mysql (#1285)
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * update
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * revert
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add sql files for postgre/mysql
      
      * add sql files
      
      * update readme from branch dev (#1288)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute (#1289)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * Update README_zh_CN.md
      
      * change postgresql default port (#1290)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT (#1291)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin (#1292)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * fix bug: remove 'between' in sql search. (#1293)
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * update
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * revert
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add sql files for postgre/mysql
      
      * add sql files
      
      * fix bug: postgre cannot support between.
      
      * fix bug: remove 'between' in sql search.
      
      * add release note
      
      * add release note
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * fix bug: list resource user a error interface. (#1294)
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * update
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * revert
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add sql files for postgre/mysql
      
      * add sql files
      
      * fix bug: postgre cannot support between.
      
      * fix bug: remove 'between' in sql search.
      
      * add release note
      
      * add release note
      
      * fix bug: list resource user a error interface.
      
      * Fix spelling mistakes
      
      * revert version to 1.2.0 (#1295)
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * update
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * revert
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add sql files for postgre/mysql
      
      * add sql files
      
      * fix bug: postgre cannot support between.
      
      * fix bug: remove 'between' in sql search.
      
      * add release note
      
      * add release note
      
      * fix bug: list resource user a error interface.
      
      * Fix spelling mistakes
      
      * revert version to 1.2.0
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * Parse the applicationId bug fix in the task log,#1298 (#1299)
      
      * reset pgsql (#1178)
      
      + 1
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * master startup error bug fix (#1229)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * master startup error bug fix
      
      * delete class App, let spring manage connectionFactory (#1233)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer (#1244)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * ConnectionFactory add paging intercepter
      
      * ConnectionFactory add paging intercepter (#1250)
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * remove spotbugs-annotations.jar LGPL protocol (#1251)
      
      * ConnectionFactory add paging intercepter
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * fix #1245, make scanCommand transactional (#1246)
      
      * fix the spring transaction not worker bug  (#1252)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * fix the spring transaction not work bug
      
      * remove author
      
      * delete @Bean annotation
      
      * rename application.properties to application-dao.properties
      
      * delete class MybatisPlusConfig (#1254)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server d…
      
      * add how to build (#1301)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * fix bug: add milliseconds in start time and end time for dependent task. (#1302)
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * update
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * revert
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add sql files for postgre/mysql
      
      * add sql files
      
      * fix bug: postgre cannot support between.
      
      * fix bug: remove 'between' in sql search.
      
      * add release note
      
      * add release note
      
      * fix bug: list resource user a error interface.
      
      * Fix spelling mistakes
      
      * revert version to 1.2.0
      
      * add milliseconds in start time and end time for dependent task.
      
      * fix bug: add user failed first time on postgre.
      
      * fix bug: add user failed first time.
      
      * update
      
      * update
      
      * update
      
      * remove dir format in assembly (#1304)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * remove dir format in assembly
      
      * dockerfile maven package modify (#1305)
      
      * reset pgsql (#1178)
      
      + 1
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * master startup error bug fix (#1229)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * master startup error bug fix
      
      * delete class App, let spring manage connectionFactory (#1233)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer (#1244)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * ConnectionFactory add paging intercepter
      
      * ConnectionFactory add paging intercepter (#1250)
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * remove spotbugs-annotations.jar LGPL protocol (#1251)
      
      * ConnectionFactory add paging intercepter
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * fix #1245, make scanCommand transactional (#1246)
      
      * fix the spring transaction not worker bug  (#1252)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * fix the spring transaction not work bug
      
      * remove author
      
      * delete @Bean annotation
      
      * rename application.properties to application-dao.properties
      
      * delete class MybatisPlusConfig (#1254)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upg…
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * Remove the judgment of whether it is admin (#1308)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * remove dir format in assembly
      
      * Remove the judgment of whether it is admin
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Remove the judgment of whether it is admin
      
      * Fix bug when the administrator authorizes the project to ordinary users (#1309)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * remove dir format in assembly
      
      * Remove the judgment of whether it is admin
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Remove the judgment of whether it is admin
      
      * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * Postgresql import primary key exception BUG fix (#1313)
      
      * reset pgsql (#1178)
      
      + 1
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * master startup error bug fix (#1229)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * master startup error bug fix
      
      * delete class App, let spring manage connectionFactory (#1233)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer (#1244)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * ConnectionFactory add paging intercepter
      
      * ConnectionFactory add paging intercepter (#1250)
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * remove spotbugs-annotations.jar LGPL protocol (#1251)
      
      * ConnectionFactory add paging intercepter
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * fix #1245, make scanCommand transactional (#1246)
      
      * fix the spring transaction not worker bug  (#1252)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * fix the spring transaction not work bug
      
      * remove author
      
      * delete @Bean annotation
      
      * rename application.properties to application-dao.properties
      
      * delete class MybatisPlusConfig (#1254)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug m…
      
      * Added description of bug fixes and reset version  (#1322)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * remove dir format in assembly
      
      * Remove the judgment of whether it is admin
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Remove the judgment of whether it is admin
      
      * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
      
      * Added description of bug fixes about create dolphinscheduler sql failed
      
      * reset version to 1.2.0-SNAPSHOT
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * update dml when init queue table (#1323)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * remove dir format in assembly
      
      * Remove the judgment of whether it is admin
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Remove the judgment of whether it is admin
      
      * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
      
      * Added description of bug fixes about create dolphinscheduler sql failed
      
      * reset version to 1.2.0-SNAPSHOT
      
      * update dml when init queue table
      
      * reset version to 1.2.0-SNAPSHOT
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * Add whether the administrator's judgment (#1325)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * remove dir format in assembly
      
      * Remove the judgment of whether it is admin
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Remove the judgment of whether it is admin
      
      * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
      
      * Added description of bug fixes about create dolphinscheduler sql failed
      
      * reset version to 1.2.0-SNAPSHOT
      
      * update dml when init queue table
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Add whether the administrator's judgment
      
      * Add method comments
      
      * Modify field name (#1327)
      
      * reset version to 1.2.0-SNAPSHOT (#1328)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * remove dir format in assembly
      
      * Remove the judgment of whether it is admin
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Remove the judgment of whether it is admin
      
      * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
      
      * Added description of bug fixes about create dolphinscheduler sql failed
      
      * reset version to 1.2.0-SNAPSHOT
      
      * update dml when init queue table
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Add whether the administrator's judgment
      
      * Add method comments
      
      * reset version to 1.2.0-SNAPSHOT
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * Comment parameter name and database name (#1329)
      
      * Modify field name
      
      * Comment parameter name and database name
      
      * Determines whether the s database is empty (#1330)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * remove dir format in assembly
      
      * Remove the judgment of whether it is admin
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Remove the judgment of whether it is admin
      
      * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
      
      * Added description of bug fixes about create dolphinscheduler sql failed
      
      * reset version to 1.2.0-SNAPSHOT
      
      * update dml when init queue table
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Add whether the administrator's judgment
      
      * Add method comments
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Determines whether the s database is empty
      
      * Determines whether the s database is empty
      
      * add selectUdfById (#1331)
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * remove dir format in assembly
      
      * Remove the judgment of whether it is admin
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Remove the judgment of whether it is admin
      
      * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
      
      * Added description of bug fixes about create dolphinscheduler sql failed
      
      * reset version to 1.2.0-SNAPSHOT
      
      * update dml when init queue table
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Add whether the administrator's judgment
      
      * Add method comments
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Determines whether the s database is empty
      
      * Determines whether the s database is empty
      
      * reset version to 1.2.0-SNAPSHOT
      
      * add selectUdfById
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add mysql for quartz in install.sh (#1332)
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * update
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * revert
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add sql files for postgre/mysql
      
      * add sql files
      
      * fix bug: postgre cannot support between.
      
      * fix bug: remove 'between' in sql search.
      
      * add release note
      
      * add release note
      
      * fix bug: list resource user a error interface.
      
      * Fix spelling mistakes
      
      * revert version to 1.2.0
      
      * add milliseconds in start time and end time for dependent task.
      
      * fix bug: add user failed first time on postgre.
      
      * fix bug: add user failed first time.
      
      * update
      
      * update
      
      * update
      
      * add mysql for quartz in install.sh
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * modify annotation and enum desc (#1342)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * modify annotation and enum desc
      
      * [Checkstyle] Add java checkstyle (#1367)
      
      * using spring context datasource (#1317)
      
      * Ans UI upgrade and component value modification (#1326)
      
      * Repair English not translated (#1338)
      
      * Add pull request template (#1372)
      
      * Add pull request template
      
      * update pull
      
      * unittest-demo (#1337)
      
      * [checkstyle] optimize java code checkstyle for EmptyStatement rule (#1373)
      
      * merge from 1.2.0-release (#1347)
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change package.xml
      
      * log view service grpc
      
      * log view service grpc
      
      * log view service grpc
      
      * log view service grpc
      
      * log view service grpc
      
      * add src pom
      
      * remove package in alert,api,server
      
      * remove package in alert,api,server
      
      * add binary-front
      
      * add binary-front
      
      * change finalname
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * change finalname
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * change scm
      
      * change scm (#1196)
      
      * package.json update
      
      * package.json update
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add name
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * update version
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add ui
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * remove unused code.
      
      * add install node-sass
      
      * remove unused code.
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db (#1225)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom (#1227)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInst…
      
      * merge from dev
      
      * Merge remote-tracking branch 'origin/dev-merge' into dev
      
      # Conflicts:
      #	README.md
      #	README_zh_CN.md
      #	docs/en_US/architecture-design.md
      #	docs/zh_CN/系统架构设计.md
      #	escheduler-alert/src/main/java/cn/escheduler/alert/AlertServer.java
      #	escheduler-api/src/main/java/cn/escheduler/api/CombinedApplicationServer.java
      #	escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java
      #	escheduler-api/src/main/java/cn/escheduler/api/utils/ZooKeeperState.java
      #	escheduler-api/src/main/java/cn/escheduler/api/utils/ZookeeperMonitor.java
      #	escheduler-api/src/test/java/cn/escheduler/api/controller/MonitorControllerTest.java
      #	escheduler-api/src/test/java/cn/escheduler/api/utils/ZookeeperMonitorUtilsTest.java
      #	escheduler-common/pom.xml
      #	escheduler-common/src/main/java/cn/escheduler/common/Constants.java
      #	escheduler-common/src/main/java/cn/escheduler/common/enums/ZKNodeType.java
      #	escheduler-common/src/main/java/cn/escheduler/common/utils/HadoopUtils.java
      #	escheduler-common/src/main/resources/common/common.properties
      #	escheduler-common/src/test/java/cn/escheduler/common/utils/IpUtilsTest.java
      #	escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java
      #	escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ErrorCommandMapperProvider.java
      #	escheduler-rpc/src/main/java/cn/escheduler/rpc/LogViewServiceGrpc.java
      #	escheduler-server/src/main/java/cn/escheduler/server/rpc/LoggerServer.java
      #	escheduler-server/src/main/java/cn/escheduler/server/utils/FlinkArgsUtils.java
      #	escheduler-server/src/test/java/cn/escheduler/server/worker/EnvFileTest.java
      #	escheduler-server/src/test/java/cn/escheduler/server/zk/ZKWorkerClientTest.java
      #	escheduler-ui/package.json
      #	escheduler-ui/src/combo/1.0.0/3rd.css
      #	escheduler-ui/src/combo/1.0.0/local.js
      #	escheduler-ui/src/font/demo.css
      #	escheduler-ui/src/font/iconfont.css
      #	escheduler-ui/src/font/iconfont.js
      #	escheduler-ui/src/js/conf/home/App.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.scss
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/commcon.js
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/datasource.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/listBox.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/resources.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/sqlType.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/statementList.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/udfs.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/procedure.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sub_process.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/index.js
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/jumpAffirm.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/variable/index.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/index.vue
      #	escheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
      #	escheduler-ui/src/js/conf/home/pages/datasource/index.vue
      #	escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
      #	escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
      #	escheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
      #	escheduler-ui/src/js/conf/home/pages/home/index.vue
      #	escheduler-ui/src/js/conf/home/pages/monitor/index.vue
      #	escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gauge.vue
      #	escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gaugeOption.js
      #	escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue
      #	escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/alert.vue
      #	escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/apiserver.vue
      #	escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
      #	escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/mysql.vue
      #	escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/rpcserver.vue
      #	escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss
      #	escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/statistics.vue
      #	escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue
      #	escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/zookeeper.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/index.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/index.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/conditions.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/list.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/definition/index.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/create/index.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/details/index.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/_source/tree.js
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/historyTaskRecord/index.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/commandStateCount.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/processStateCount.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/queueCount.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/instance/index.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/details/index.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/_source/gantt.js
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/taskRecord/index.vue
      #	escheduler-ui/src/js/conf/home/pages/projects/pages/timing/index.vue
      #	escheduler-ui/src/js/conf/home/pages/resource/index.vue
      #	escheduler-ui/src/js/conf/home/pages/resource/pages/file/index.vue
      #	escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue
      #	escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/noType.vue
      #	escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
      #	escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue
      #	escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
      #	escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue
      #	escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
      #	escheduler-ui/src/js/conf/home/pages/resource/pages/udf/index.vue
      #	escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue
      #	escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
      #	escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
      #	escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
      #	escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue
      #	escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
      #	escheduler-ui/src/js/conf/home/pages/security/index.vue
      #	escheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue
      #	escheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/list.vue
      #	escheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
      #	escheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
      #	escheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
      #	escheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
      #	escheduler-ui/src/js/conf/home/pages/security/pages/token/index.vue
      #	escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
      #	escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
      #	escheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
      #	escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue
      #	escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
      #	escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
      #	escheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/createWorker.vue
      #	escheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue
      #	escheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue
      #	escheduler-ui/src/js/conf/home/pages/user/index.vue
      #	escheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue
      #	escheduler-ui/src/js/conf/home/pages/user/pages/account/index.vue
      #	escheduler-ui/src/js/conf/home/pages/user/pages/password/_source/info.vue
      #	escheduler-ui/src/js/conf/home/pages/user/pages/password/index.vue
      #	escheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue
      #	escheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue
      #	escheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
      #	escheduler-ui/src/js/conf/login/App.vue
      #	escheduler-ui/src/js/module/components/conditions/conditions.vue
      #	escheduler-ui/src/js/module/components/fileUpdate/fileUpdate.vue
      #	escheduler-ui/src/js/module/components/fileUpdate/udfUpdate.vue
      #	escheduler-ui/src/js/module/components/layout/layout.vue
      #	escheduler-ui/src/js/module/components/listBoxF/listBoxF.vue
      #	escheduler-ui/src/js/module/components/listConstruction/listConstruction.vue
      #	escheduler-ui/src/js/module/components/nav/nav.vue
      #	escheduler-ui/src/js/module/components/noData/noData.vue
      #	escheduler-ui/src/js/module/components/popup/popup.vue
      #	escheduler-ui/src/js/module/components/priority/priority.vue
      #	escheduler-ui/src/js/module/components/progressBar/progressBar.vue
      #	escheduler-ui/src/js/module/components/secondaryMenu/secondaryMenu.vue
      #	escheduler-ui/src/js/module/components/spin/spin.vue
      #	escheduler-ui/src/js/module/components/tooltipsJSON/tooltipsJSON.vue
      #	escheduler-ui/src/js/module/components/transfer/transfer.vue
      #	escheduler-ui/src/js/module/i18n/locale/en_US.js
      #	escheduler-ui/src/js/module/i18n/locale/zh_CN.js
      #	escheduler-ui/src/js/module/util/clickoutside.js
      #	escheduler-ui/src/js/module/util/index.js
      #	escheduler-ui/src/lib/@analysys/ans-ui/package.json
      #	escheduler-ui/src/view/docs/zh_CN/_book/gitbook/gitbook-plugin-livereload/plugin.js
      #	escheduler-ui/src/view/docs/zh_CN/_book/gitbook/gitbook.js
      #	escheduler-ui/src/view/docs/zh_CN/_book/gitbook/theme.js
      #	install.sh
      #	pom.xml
      1baa1f42
    • B
      merge from 1.2.0-release (#1347) · a55537f1
      bao liang 提交于
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change package.xml
      
      * log view service grpc
      
      * log view service grpc
      
      * log view service grpc
      
      * log view service grpc
      
      * log view service grpc
      
      * add src pom
      
      * remove package in alert,api,server
      
      * remove package in alert,api,server
      
      * add binary-front
      
      * add binary-front
      
      * change finalname
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * change finalname
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * change scm
      
      * change scm (#1196)
      
      * package.json update
      
      * package.json update
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add name
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * update version
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add ui
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * remove unused code.
      
      * add install node-sass
      
      * remove unused code.
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db (#1225)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom (#1227)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add maven-source-plugin
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * ci and maven pom.xml modify (#1234)
      
      * change verison to 1.2.0-release-SNAPSHOT (#1235)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] rollback the release of 1.2.0-release
      
      * add name in pom and remove compile (#1236)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom (#1237)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * update pom
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add release-docs (#1241)
      
      license and notice statistics
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * merge from dev-db (#1248)
      
      * reset pgsql (#1178)
      
      + 1
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * master startup error bug fix (#1229)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * master startup error bug fix
      
      * delete class App, let spring manage connectionFactory (#1233)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * update pom.xml
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] prepare release 1.2.2-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * update license (#1249)
      
      * add licenses in assemble (#1253)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT (#1255)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * [maven-release-plugin] prepare release 1.2.0-RC1
      
      * [maven-release-plugin] prepare for next development iteration
      
      * change assembly id (#1261)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * add DISCLAIMER (#1262)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * add license in xml and properties (#1265)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * add license in dockerfile (#1269)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * merge dev-db to 1.2.0-release (#1270)
      
      * reset pgsql (#1178)
      
      + 1
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * master startup error bug fix (#1229)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * master startup error bug fix
      
      * delete class App, let spring manage connectionFactory (#1233)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer (#1244)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * ConnectionFactory add paging intercepter
      
      * ConnectionFactory add paging intercepter (#1250)
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * remove spotbugs-annotations.jar LGPL protocol (#1251)
      
      * ConnectionFactory add paging intercepter
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * fix #1245, make scanCommand transactional (#1246)
      
      * fix the spring transaction not worker bug  (#1252)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * fix the spring transaction not work bug
      
      * remove author
      
      * delete @Bean annotation
      
      * rename application.properties to application-dao.properties
      
      * delete class MybatisPlusConfig (#1254)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgra…
      
      * add license in script and sql (#1271)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * merge dev-db to 1.2.0-release (#1272)
      
      * reset pgsql (#1178)
      
      + 1
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * master startup error bug fix (#1229)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * master startup error bug fix
      
      * delete class App, let spring manage connectionFactory (#1233)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer (#1244)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * ConnectionFactory add paging intercepter
      
      * ConnectionFactory add paging intercepter (#1250)
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * remove spotbugs-annotations.jar LGPL protocol (#1251)
      
      * ConnectionFactory add paging intercepter
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * fix #1245, make scanCommand transactional (#1246)
      
      * fix the spring transaction not worker bug  (#1252)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * fix the spring transaction not work bug
      
      * remove author
      
      * delete @Bean annotation
      
      * rename application.properties to application-dao.properties
      
      * delete class MybatisPlusConfig (#1254)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgra…
      
      * add license in ci (#1273)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * merge dev-db to 1.2.0-release (#1276)
      
      * reset pgsql (#1178)
      
      + 1
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * master startup error bug fix (#1229)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * master startup error bug fix
      
      * delete class App, let spring manage connectionFactory (#1233)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer (#1244)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * ConnectionFactory add paging intercepter
      
      * ConnectionFactory add paging intercepter (#1250)
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * remove spotbugs-annotations.jar LGPL protocol (#1251)
      
      * ConnectionFactory add paging intercepter
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * fix #1245, make scanCommand transactional (#1246)
      
      * fix the spring transaction not worker bug  (#1252)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * fix the spring transaction not work bug
      
      * remove author
      
      * delete @Bean annotation
      
      * rename application.properties to application-dao.properties
      
      * delete class MybatisPlusConfig (#1254)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgra…
      
      * change version to 1.2.0-SNAPSHOT (#1277)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * set defalut db type postgresql (#1282)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge incomplete (#1283)
      
      * Add comments in method params and change org.quartz.jobStore.driverDelegateClass in docer file (#1284)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * REGEX_USER_NAME modify,support number and underline,task yarn status judge bug fix (#1287)
      
      * reset pgsql (#1178)
      
      + 1
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * master startup error bug fix (#1229)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * master startup error bug fix
      
      * delete class App, let spring manage connectionFactory (#1233)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer (#1244)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * ConnectionFactory add paging intercepter
      
      * ConnectionFactory add paging intercepter (#1250)
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * remove spotbugs-annotations.jar LGPL protocol (#1251)
      
      * ConnectionFactory add paging intercepter
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * fix #1245, make scanCommand transactional (#1246)
      
      * fix the spring transaction not worker bug  (#1252)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * fix the spring transaction not work bug
      
      * remove author
      
      * delete @Bean annotation
      
      * rename application.properties to application-dao.properties
      
      * delete class MybatisPlusConfig (#1254)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker …
      
      * add sql files for postgre/mysql (#1285)
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * update
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * revert
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add sql files for postgre/mysql
      
      * add sql files
      
      * update readme from branch dev (#1288)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute (#1289)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * Update README_zh_CN.md
      
      * change postgresql default port (#1290)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT (#1291)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin (#1292)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * fix bug: remove 'between' in sql search. (#1293)
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * update
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * revert
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add sql files for postgre/mysql
      
      * add sql files
      
      * fix bug: postgre cannot support between.
      
      * fix bug: remove 'between' in sql search.
      
      * add release note
      
      * add release note
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * fix bug: list resource user a error interface. (#1294)
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * update
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * revert
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add sql files for postgre/mysql
      
      * add sql files
      
      * fix bug: postgre cannot support between.
      
      * fix bug: remove 'between' in sql search.
      
      * add release note
      
      * add release note
      
      * fix bug: list resource user a error interface.
      
      * Fix spelling mistakes
      
      * revert version to 1.2.0 (#1295)
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * update
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * revert
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add sql files for postgre/mysql
      
      * add sql files
      
      * fix bug: postgre cannot support between.
      
      * fix bug: remove 'between' in sql search.
      
      * add release note
      
      * add release note
      
      * fix bug: list resource user a error interface.
      
      * Fix spelling mistakes
      
      * revert version to 1.2.0
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * Parse the applicationId bug fix in the task log,#1298 (#1299)
      
      * reset pgsql (#1178)
      
      + 1
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * master startup error bug fix (#1229)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * master startup error bug fix
      
      * delete class App, let spring manage connectionFactory (#1233)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer (#1244)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * ConnectionFactory add paging intercepter
      
      * ConnectionFactory add paging intercepter (#1250)
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * remove spotbugs-annotations.jar LGPL protocol (#1251)
      
      * ConnectionFactory add paging intercepter
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * fix #1245, make scanCommand transactional (#1246)
      
      * fix the spring transaction not worker bug  (#1252)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * fix the spring transaction not work bug
      
      * remove author
      
      * delete @Bean annotation
      
      * rename application.properties to application-dao.properties
      
      * delete class MybatisPlusConfig (#1254)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server d…
      
      * add how to build (#1301)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * fix bug: add milliseconds in start time and end time for dependent task. (#1302)
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * update
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * revert
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add sql files for postgre/mysql
      
      * add sql files
      
      * fix bug: postgre cannot support between.
      
      * fix bug: remove 'between' in sql search.
      
      * add release note
      
      * add release note
      
      * fix bug: list resource user a error interface.
      
      * Fix spelling mistakes
      
      * revert version to 1.2.0
      
      * add milliseconds in start time and end time for dependent task.
      
      * fix bug: add user failed first time on postgre.
      
      * fix bug: add user failed first time.
      
      * update
      
      * update
      
      * update
      
      * remove dir format in assembly (#1304)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * remove dir format in assembly
      
      * dockerfile maven package modify (#1305)
      
      * reset pgsql (#1178)
      
      + 1
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * master startup error bug fix (#1229)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * master startup error bug fix
      
      * delete class App, let spring manage connectionFactory (#1233)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer (#1244)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * ConnectionFactory add paging intercepter
      
      * ConnectionFactory add paging intercepter (#1250)
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * remove spotbugs-annotations.jar LGPL protocol (#1251)
      
      * ConnectionFactory add paging intercepter
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * fix #1245, make scanCommand transactional (#1246)
      
      * fix the spring transaction not worker bug  (#1252)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * fix the spring transaction not work bug
      
      * remove author
      
      * delete @Bean annotation
      
      * rename application.properties to application-dao.properties
      
      * delete class MybatisPlusConfig (#1254)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upg…
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * Remove the judgment of whether it is admin (#1308)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * remove dir format in assembly
      
      * Remove the judgment of whether it is admin
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Remove the judgment of whether it is admin
      
      * Fix bug when the administrator authorizes the project to ordinary users (#1309)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * remove dir format in assembly
      
      * Remove the judgment of whether it is admin
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Remove the judgment of whether it is admin
      
      * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * Postgresql import primary key exception BUG fix (#1313)
      
      * reset pgsql (#1178)
      
      + 1
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * master startup error bug fix (#1229)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * master startup error bug fix
      
      * delete class App, let spring manage connectionFactory (#1233)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer (#1244)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * ConnectionFactory add paging intercepter
      
      * ConnectionFactory add paging intercepter (#1250)
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * remove spotbugs-annotations.jar LGPL protocol (#1251)
      
      * ConnectionFactory add paging intercepter
      
      * remove spotbugs-annotations.jar LGPL protocol
      
      * fix #1245, make scanCommand transactional (#1246)
      
      * fix the spring transaction not worker bug  (#1252)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * delete App, let spring manage connectionFactory
      
      * add license
      
      * add class Application for test support
      
      * refactor masterServer and workerServer
      
      * add args
      
      * fix the spring transaction not work bug
      
      * remove author
      
      * delete @Bean annotation
      
      * rename application.properties to application-dao.properties
      
      * delete class MybatisPlusConfig (#1254)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug m…
      
      * Added description of bug fixes and reset version  (#1322)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * remove dir format in assembly
      
      * Remove the judgment of whether it is admin
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Remove the judgment of whether it is admin
      
      * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
      
      * Added description of bug fixes about create dolphinscheduler sql failed
      
      * reset version to 1.2.0-SNAPSHOT
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * update dml when init queue table (#1323)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * remove dir format in assembly
      
      * Remove the judgment of whether it is admin
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Remove the judgment of whether it is admin
      
      * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
      
      * Added description of bug fixes about create dolphinscheduler sql failed
      
      * reset version to 1.2.0-SNAPSHOT
      
      * update dml when init queue table
      
      * reset version to 1.2.0-SNAPSHOT
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * Add whether the administrator's judgment (#1325)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * remove dir format in assembly
      
      * Remove the judgment of whether it is admin
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Remove the judgment of whether it is admin
      
      * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
      
      * Added description of bug fixes about create dolphinscheduler sql failed
      
      * reset version to 1.2.0-SNAPSHOT
      
      * update dml when init queue table
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Add whether the administrator's judgment
      
      * Add method comments
      
      * Modify field name (#1327)
      
      * reset version to 1.2.0-SNAPSHOT (#1328)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * remove dir format in assembly
      
      * Remove the judgment of whether it is admin
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Remove the judgment of whether it is admin
      
      * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
      
      * Added description of bug fixes about create dolphinscheduler sql failed
      
      * reset version to 1.2.0-SNAPSHOT
      
      * update dml when init queue table
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Add whether the administrator's judgment
      
      * Add method comments
      
      * reset version to 1.2.0-SNAPSHOT
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * Comment parameter name and database name (#1329)
      
      * Modify field name
      
      * Comment parameter name and database name
      
      * Determines whether the s database is empty (#1330)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * remove dir format in assembly
      
      * Remove the judgment of whether it is admin
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Remove the judgment of whether it is admin
      
      * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
      
      * Added description of bug fixes about create dolphinscheduler sql failed
      
      * reset version to 1.2.0-SNAPSHOT
      
      * update dml when init queue table
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Add whether the administrator's judgment
      
      * Add method comments
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Determines whether the s database is empty
      
      * Determines whether the s database is empty
      
      * add selectUdfById (#1331)
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * add profile test
      
      * add maven.deploy.skip true
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add dependency
      
      * add javadoc
      
      * add antrun
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * reset pgsql (#1178)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * [maven-release-plugin] rollback the release of 1.2.0
      
      * add javadoc
      
      * Ans UI upgrade to version 0.1.0 (#1181)
      
      + 1
      
      * add javadoc
      
      * add javadoc
      
      * add javadoc
      
      * Administrators group prohibit deletion (#1182)
      
      * Ans UI upgrade to version 0.1.0
      
      * Administrators group prohibit deletion
      
      * add javadoc
      
      * add ui pom
      
      * fix master server shutdown error (#1177)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class (#1183)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * add ui pom
      
      * add src pom and assembly
      
      * fix ZKWorkerClient not close PathChildrenCache (#1185)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method (#1186)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile dao application.properties ,install.sh modify and application.properties modify (#1187)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * add src pom and assembly
      
      * add src pom and assembly
      
      * dockerfile startup.sh modify (#1189)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs (#1191)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1192)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile conf modify (#1193)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change (#1194)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in english (#1195)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify (#1198)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify (#1199)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese sql to english. (#1200)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * change chinese to english (#1202)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * remove unused code (#1204)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * Modify webpack configuration (#1206)
      
      * add more message for java-doc (#1209)
      
      * move updateTaskState into try/catch block in case of exception
      
      * fix NPE
      
      * using conf.getInt instead of getString
      
      * for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
      for AlertDao, correct the spelling.
      
      * duplicate
      
      * refactor getTaskWorkerGroupId
      
      * add friendly log
      
      * update hearbeat thread num = 1
      
      * fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread
      
      * 1. move verifyTaskInstanceIsNull after taskInstance
      2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable
      
      * fix the message
      
      * delete before check to avoid KeeperException$NoNodeException
      
      * fix the message
      
      * check processInstance state before delete tenant
      
      * check processInstance state before delete worker group
      
      * refactor
      
      * merge api constants into common constatns
      
      * update the resource perm
      
      * update the dataSource perm
      
      * fix CheckUtils.checkUserParams method
      
      * update AlertGroupService, extends from BaseService, remove duplicate methods
      
      * refactor
      
      * modify method name
      
      * add hasProjectAndPerm method
      
      * using checkProject instead of getResultStatus
      
      * delete checkAuth method, using hasProjectAndPerm instead.
      
      * correct spelling
      
      * add transactional for deleteWorkerGroupById
      
      * add Transactional for deleteProcessInstanceById method
      
      * change sqlSessionTemplate singleton
      
      * change sqlSessionTemplate singleton and reformat code
      
      * fix unsuitable error message
      
      * update shutdownhook methods
      
      * fix worker log bug
      
      * fix api server debug mode bug
      
      * upgrade zk version
      
      * delete this line ,for zkClient.close() will do the whole thing
      
      * fix master server shutdown error
      
      * degrade zk version and add FourLetterWordMain class
      
      * fix PathChildrenCache not close
      
      * add Transactional for createSession method
      
      * add more message for java-doc
      
      * add java doc for common module (#1213)
      
      * dao method comments and useless code modify (#1214)
      
      * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml
      
      * .escheduler_env.sh to dolphinscheduler_env.sh
      
      * dao yml assembly to conf directory
      
      * table name modify
      
      * entity title table  name modify
      
      * logback log name modify
      
      * running through the big process
      
      * running through the big process error modify
      
      * logback log name modify
      
      * data_source.properties rename
      
      * logback log name modify
      
      * install.sh optimization
      
      * install.sh optimization
      
      * command count modify
      
      * command state update
      
      * countCommandState sql update
      
      * countCommandState sql update
      
      * remove application.yml file
      
      * master.properties modify
      
      * install.sh modify
      
      * install.sh modify
      
      * api server startup modify
      
      * the current user quits and the session is completely emptied. bug fix
      
      * remove pom package resources
      
      * checkQueueNameExist method update
      
      * checkQueueExist
      
      * install.sh error output update
      
      * signOut error update
      
      * ProcessDao is null bug fix
      
      * install.sh add mail.user
      
      * request url variables replace
      
      * process define import bug fix
      
      * process define import export bug fix
      
      * processdefine import export bug fix
      
      * down log suffix format modify
      
      * import export process define contains crontab error bug fix
      
      * add Flink local mode
      
      * ProcessDao is null bug fix
      
      * loadAverage display problem bug fix
      
      * MasterServer rename Server
      
      * rollback .env
      
      * rollback .env
      
      * MasterServer rename Server
      
      * the task is abnormal and task is running bug fix
      
      * owners and administrators can delete
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * dockerfile optimization
      
      * remove application-alert.properties
      
      * task log print worker log bug fix
      
      * remove .escheduler_env.sh
      
      * change dockerfile email address
      
      * dockerfile dao application.properties and install.sh modify
      
      * application.properties modify
      
      * application.properties modify
      
      * dockerfile startup.sh modify
      
      * remove docs
      
      * nginx conf modify
      
      * dockerfile application.properties modify
      
      * dockerfile email address change
      
      * the alert module is modified in English.
      
      * alert server comment and chinese modify
      
      * api server useless code and chinese modify
      
      * common,dao,server useless code and chinese modify
      
      * change chinese to english
      
      * dao method comments and useless code modify
      
      * Change all Chinese names to English (#1207)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin (#1215)
      
      * Modify webpack configuration
      
      * Change all Chinese names to English
      
      * add progress-bar-webpack-plugin
      
      * Add method and parameters comments (#1220)
      
      * rename from DatasourceUserMapper to DataSourceUserMapper
      
      * add unit test in UserMapper and WorkerGroupMapper
      
      * change cn.escheduler to org.apache.dolphinscheduler
      
      * add unit test in UdfFuncMapperTest
      
      * add unit test in UdfFuncMapperTest
      
      * remove DatabaseConfiguration
      
      * add ConnectionFactoryTest
      
      * cal duration in processInstancesList
      
      * change desc to description
      
      * change table name in mysql ddl
      
      * change table name in mysql ddl
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * change escheduler to dolphinscheduler
      
      * remove log4j-1.2-api and modify AlertMapperTest
      
      * remove log4j-1.2-api
      
      * Add alertDao to spring management
      
      * Add alertDao to spring management
      
      * get SqlSessionFactory from MybatisSqlSessionFactoryBean
      
      * get processDao by DaoFactory
      
      * read druid properties in ConneciontFactory
      
      * read druid properties in ConneciontFactory
      
      * change get alertDao by spring to DaoFactory
      
      * add log4j to resolve #967
      
      * resole verify udf name error and delete udf error
      
      * Determine if principal is empty
      
      * Determine whether the logon user has the right to delete the project
      
      * Fixed an issue that produced attatch file named such as ATT00002.bin
      
      * fix too many connection in upgrade or create
      
      * fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail
      
      * Added a judgment on whether the currently login user is an administrator
      
      * fix update udf database not change and create time is changed
      
      * add enterprise.wechat.enable to decide whether to send enterprise WeChat
      
      * change method check
      
      * Remove the administrator's judgment on query access token list
      
      * only admin can create worker group
      
      * delete alert group need delete the relation of user and alert group
      
      * add timeout in proxy when upload large resource
      
      * add gets scheduled times by expect fire times
      
      * add gets scheduled times by expect fire times
      
      * Increase the judgment of whether it is admin
      
      * Increase the judgment of whether it is admin
      
      * when delete access token add whether login user has perm to delete
      
      * change mysql-connector-java scope to test
      
      * update scm test
      
      * add profile test
      
      * Add method and parameters comments
      
      * roll back
      
      * add some notes (#1221)
      
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      
      * add mybatis plus model
      
      * modify mybatisplus
      
      * modify mybatisplus
      
      * change interface by mybatisplus
      
      * add unit test
      
      * refactor dao interface.
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * add unit test for dao...
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
      #	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
      #	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update some dao bugs
      
      * update for some bugs
      
      * update some bugs
      
      * Merge remote-tracking branch 'upstream/dev-db' into dev-db
      
      # Conflicts:
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
      #	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
      
      * update
      
      * update
      
      * add multiply settings for application.yml
      
      * add multiply settings for application.yml
      
      * revert
      
      * update configuration settings in task record dao...
      
      * change application_master to application-master
      
      * change application_master to application-master
      
      * update application.yml to application.properties
      
      * revert
      
      * revert
      
      * add properties
      
      * add properties
      
      * revert
      
      * revert
      
      * add api start up..
      add alert send try catch
      
      * update dao info level
      
      * fix bug: task cannot submit when recovery failover
      
      * fix bug: task cannot submit when recovery failover
      
      * merge from dev-db
      
      * revert
      
      * revert
      
      * fix bug: get process definition list failed.
      
      * fix bug: process instance interval is error
      
      * revert
      
      * revert
      
      * update
      
      * support stop submit success tasks
      
      * update kill process
      
      * update for stop process
      
      * update for stop process
      
      * add some logs for stop process
      
      * update for small bug.
      
      * add check strategy before submit task
      
      * revert
      
      * update
      
      * update
      
      * revert
      
      * wait task instance exists if null.
      
      * revert
      
      * update
      
      * change desc to description.
      
      * add check user and definitions function when delete tenant
      
      * update
      
      * change desc to description.
      
      * change desc to description.
      
      * change desc to description.
      
      * remove check resources when delete tenant
      
      * change desc to description.
      
      * change mybatisplus version to 3.2.0
      
      * update
      
      * change the notice to apache.
      
      * update
      
      * update postgre sql
      
      * fix bug: phone can be empty.
      
      * fix bug: postgre test error.
      
      * update create table for postgre quartz
      
      * fix some bugs about postgre.
      
      * update create table for postgre quartz
      
      * add postgre db performance monitor
      
      * add postgre performance monitor
      
      * update performance monitor
      
      * revert
      
      * revert
      
      * fix bug: tasks queue length error
      
      * remove datasource.properties
      
      * change chinese sql to english.
      
      * change chinese sql to english.
      
      * remove unused code.
      
      * remove unused code.
      
      * add some notes
      
      * update some notes
      
      * update some notes
      
      * update mbatisplus version
      
      * update lombok version
      
      * update lombok version
      
      * revert
      
      * merge from dev-db
      
      * remove version
      
      * update npm install pom
      
      * add front assembly
      
      * add front module
      
      * change verison to 1.2.0-release-SNAPSHOT
      
      * add name in pom and remove compile
      
      * add name in pom
      
      * add licenses in assemble
      
      * change version to 1.2.0-RC1-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change assembly id
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add DISCLAIMER
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in xml and properties
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in dockerfile
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in script and sql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      add license in ci
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      change version to 1.2.0-SNAPSHOT
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * Merge remote-tracking branch 'remotes/upstream/1.2.0-release' into 1.2.0-release
      
      # Conflicts:
      #	dolphinscheduler-alert/pom.xml
      #	dolphinscheduler-api/pom.xml
      #	dolphinscheduler-common/pom.xml
      #	dolphinscheduler-dao/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-backend/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-front/pom.xml
      #	dolphinscheduler-dist/dolphinscheduler-src/pom.xml
      #	dolphinscheduler-dist/pom.xml
      #	dolphinscheduler-rpc/pom.xml
      #	dolphinscheduler-server/pom.xml
      #	dolphinscheduler-ui/pom.xml
      #	pom.xml
      set defalut db type postgresql
      
      * change org.quartz.jobStore.driverDelegateClass
      
      * Add comments in method params
      
      * update readme from branch dev
      
      * update content in how to contribute
      
      * change postgresql default port
      
      * change version 1.2.0-SNAPSHOT
      
      * remove antrun plugin
      
      * add how to build
      
      * add how to build
      
      * remove dir format in assembly
      
      * Remove the judgment of whether it is admin
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Remove the judgment of whether it is admin
      
      * Fix bug the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
      
      * Added description of bug fixes about create dolphinscheduler sql failed
      
      * reset version to 1.2.0-SNAPSHOT
      
      * update dml when init queue table
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Add whether the administrator's judgment
      
      * Add method comments
      
      * reset version to 1.2.0-SNAPSHOT
      
      * Determines whether the s database is empty
      
      * Determines whether the s database is empty
      
      * reset version to 1.2.0-SNAPSHOT
      
      * add selectUdfById
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add mysql for quartz in install.sh (#1332)
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * update
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * [maven-release-plugin] prepare release 1.2.1-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * revert
      
      * [maven-release-plugin] prepare release 1.2.0-release
      
      * [maven-release-plugin] prepare for next development iteration
      
      * add sql files for postgre/mysql
      
      * add sql files
      
      * fix bug: postgre cannot support between.
      
      * fix bug: remove 'between' in sql search.
      
      * add release note
      
      * add release note
      
      * fix bug: list resource user a error interface.
      
      * Fix spelling mistakes
      
      * revert version to 1.2.0
      
      * add milliseconds in start time and end time for dependent task.
      
      * fix bug: add user failed first time on postgre.
      
      * fix bug: add user failed first time.
      
      * update
      
      * update
      
      * update
      
      * add mysql for quartz in install.sh
      
      * [maven-release-plugin] prepare release 1.2.0
      
      * [maven-release-plugin] prepare for next development iteration
      a55537f1
  20. 13 10月, 2019 1 次提交
  21. 27 8月, 2019 1 次提交
    • B
      update documents (#740) · b99c7a66
      bao liang 提交于
      * update english documents
      
      * refactor zk client
      
      * update documents
      
      * update zkclient
      
      * update zkclient
      
      * update documents
      
      * add architecture-design
      
      * change i18n
      
      * update i18n
      
      * update english documents
      
      * add architecture-design
      
      * update english documents
      
      * update en-US documents
      
      * add architecture-design
      
      * update demo site
      b99c7a66
  22. 02 8月, 2019 3 次提交
  23. 30 7月, 2019 1 次提交
  24. 25 7月, 2019 1 次提交
  25. 19 7月, 2019 1 次提交
  26. 17 7月, 2019 1 次提交
  27. 05 6月, 2019 1 次提交
  28. 30 5月, 2019 1 次提交
  29. 27 5月, 2019 3 次提交