1. 27 8月, 2020 1 次提交
  2. 25 8月, 2020 2 次提交
  3. 22 8月, 2020 1 次提交
  4. 22 7月, 2020 1 次提交
  5. 21 7月, 2020 2 次提交
  6. 20 7月, 2020 1 次提交
    • B
      fix · d9b7839e
      break60 提交于
      d9b7839e
  7. 16 7月, 2020 1 次提交
  8. 15 7月, 2020 1 次提交
    • B
      dag add close buttion (#3195) · c453a5bd
      BoYiZhang 提交于
      * 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 3a2cba7aCo-authored-by: Ndailidong <dailidong66@gmail.com>
      Co-authored-by: Nxingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
      c453a5bd
  9. 02 7月, 2020 1 次提交
  10. 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
  11. 26 5月, 2020 1 次提交
  12. 15 5月, 2020 1 次提交
  13. 09 5月, 2020 1 次提交
  14. 06 5月, 2020 1 次提交
  15. 30 4月, 2020 1 次提交
  16. 11 4月, 2020 2 次提交
  17. 23 3月, 2020 1 次提交
  18. 18 3月, 2020 1 次提交
  19. 13 3月, 2020 1 次提交
  20. 12 3月, 2020 1 次提交
  21. 28 2月, 2020 1 次提交
  22. 25 2月, 2020 1 次提交
    • Z
      Fix bug #1986. (#1987) · 5f3d88e4
      zhukai 提交于
      When in the projects define page, click the toolbar's button(task type) will cause the task details window switch to new one.
      
      For now, the task details window will not switch.
      5f3d88e4
  23. 17 2月, 2020 1 次提交
    • Z
      Fix the bug #1968. (#1969) · afd5c75c
      zhukai 提交于
      When create a new task or edit an exist task.The task details window will be open.
      Then if delete the task node or click the DataSource menu. And the task details window still open.
      
      The task details window should be close.
      afd5c75c
  24. 16 1月, 2020 1 次提交
    • B
      Fix DAG task nodes keep requesting API and tooltip background color modification (#1837) · 5739afb9
      break60 提交于
      * fix udfs assignment and task instance page jump #1789
      
      * jest add coverage display
      
      * Fix data echo, style, popup cannot be closed and license
      
      * Fix data echo, style, popup cannot be closed and license
      
      * fix
      
      * Requests the previous page when there is no data on the list page
      
      * Fix DAG task nodes keep requesting API and tooltip background color modification
      5739afb9
  25. 07 1月, 2020 1 次提交
    • B
      Fix front-end code specifications (#1726) · b8fa7dac
      break60 提交于
      * Fix api url
      
      * Fixed DAG zoom in and zoom out nodes separated from arrows
      
      * Fix front-end code specifications
      
      * Fix front-end code specifications
      
      * Fix front-end code specifications
      b8fa7dac
  26. 03 1月, 2020 2 次提交
  27. 20 12月, 2019 1 次提交
    • B
      Remove iconfont, awesome, replace with ans-ui icon (#1527) · b859be48
      break60 提交于
      * Password verification and v-for add key
      
      * DAG automatic layout
      
      * combo.js replacement
      
      * combo.js replacement
      
      * webpack upgrade to 4
      
      * packjson has a file name that has not changed
      
      * Solve jertty packing garbled
      
      * Modify dashboard color
      
      * Remove iconfont, awesome, replace with ans-ui icon
      b859be48
  28. 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
  29. 17 12月, 2019 1 次提交
  30. 05 12月, 2019 1 次提交
  31. 03 12月, 2019 1 次提交
    • 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
  32. 30 9月, 2019 1 次提交
  33. 29 9月, 2019 1 次提交
  34. 10 7月, 2019 1 次提交
  35. 04 7月, 2019 1 次提交